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:
parent
2b6413891c
commit
01f3717f86
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
logs:
|
logs:
|
||||||
- name: Host State Change
|
- name: Host State Change
|
||||||
type: nfv_vim_host_nfvi_state_change
|
type: nfv_vim_host_nfvi_state_change
|
||||||
@ -606,7 +607,8 @@ logs:
|
|||||||
'name': u'(.*)', 'tenant_id': '(.*)', 'avail_status': \\[(.*)], 'nfvi_data':
|
'name': u'(.*)', 'tenant_id': '(.*)', 'avail_status': \\[(.*)], 'nfvi_data':
|
||||||
{'vm_state': u'(.*)', 'task_state': u?'(.*)', 'power_state': '(.*)'},
|
{'vm_state': u'(.*)', 'task_state': u?'(.*)', 'power_state': '(.*)'},
|
||||||
'live_migration_support': (.*), 'oper_state': '(.*)', 'host_name': u'(.*)',
|
'live_migration_support': (.*), 'oper_state': '(.*)', 'host_name': u'(.*)',
|
||||||
'admin_state': '(.*)', 'action': '(.*)', 'image_uuid': (.*), 'uuid': u'(.*)'}."
|
'admin_state': '(.*)', 'action': '(.*)', 'image_uuid': (.*),
|
||||||
|
'uuid': u'(.*)'}."
|
||||||
fields:
|
fields:
|
||||||
- instance_type
|
- instance_type
|
||||||
- instance_name
|
- instance_name
|
||||||
@ -706,7 +708,8 @@ logs:
|
|||||||
- name: Instance Live-Migrate Callback
|
- name: Instance Live-Migrate Callback
|
||||||
type: nfv_vim_instance_live_migrate_callback
|
type: nfv_vim_instance_live_migrate_callback
|
||||||
file: _instance_task_work.py
|
file: _instance_task_work.py
|
||||||
regex: "Live-Migrate-Instance callback for (.*), response={'completed': (.*),
|
regex: "Live-Migrate-Instance callback for (.*),
|
||||||
|
response={'completed': (.*),
|
||||||
'reason': (.*)}."
|
'reason': (.*)}."
|
||||||
fields:
|
fields:
|
||||||
- instance_name
|
- instance_name
|
||||||
@ -716,7 +719,8 @@ logs:
|
|||||||
- name: Instance Cold-Migrate Callback
|
- name: Instance Cold-Migrate Callback
|
||||||
type: nfv_vim_instance_cold_migrate_callback
|
type: nfv_vim_instance_cold_migrate_callback
|
||||||
file: _instance_task_work.py
|
file: _instance_task_work.py
|
||||||
regex: "Cold-Migrate-Instance callback for (.*), response={'completed': (.*),
|
regex: "Cold-Migrate-Instance callback for (.*),
|
||||||
|
response={'completed': (.*),
|
||||||
'reason': (.*)}."
|
'reason': (.*)}."
|
||||||
fields:
|
fields:
|
||||||
- instance_name
|
- instance_name
|
||||||
@ -766,7 +770,8 @@ logs:
|
|||||||
- name: Instance Resize Revert Callback
|
- name: Instance Resize Revert Callback
|
||||||
type: nfv_vim_instance_resize_revert_callback
|
type: nfv_vim_instance_resize_revert_callback
|
||||||
file: _instance_task_work.py
|
file: _instance_task_work.py
|
||||||
regex: "Resize-Revert-Instance callback for (.*), response={'completed': (.*),
|
regex: "Resize-Revert-Instance callback for (.*),
|
||||||
|
response={'completed': (.*),
|
||||||
'reason': (.*)}."
|
'reason': (.*)}."
|
||||||
fields:
|
fields:
|
||||||
- instance_name
|
- instance_name
|
||||||
@ -790,7 +795,8 @@ logs:
|
|||||||
- name: Instance Guest Services Enable
|
- name: Instance Guest Services Enable
|
||||||
type: nfv_vim_instance_guest_services_enable
|
type: nfv_vim_instance_guest_services_enable
|
||||||
file: _instance_task_work.py
|
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': '(.*)'}]."
|
'(.*)', 'service': '(.*)'}]."
|
||||||
fields:
|
fields:
|
||||||
- instance_name
|
- instance_name
|
||||||
@ -800,7 +806,8 @@ logs:
|
|||||||
- name: Instance Guest Services Enable Callback
|
- name: Instance Guest Services Enable Callback
|
||||||
type: nfv_vim_instance_guest_services_enable_callback
|
type: nfv_vim_instance_guest_services_enable_callback
|
||||||
file: _instance_task_work.py
|
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':
|
'reason': (.*), 'result-data': {'instance_uuid': u'(.*)', 'services':
|
||||||
\\[{'admin_state': '(.*)', 'restart_timeout': (.*), 'oper_state': '(.*)',
|
\\[{'admin_state': '(.*)', 'restart_timeout': (.*), 'oper_state': '(.*)',
|
||||||
'name': '(.*)'}], 'host_name': u'(.*)'}}."
|
'name': '(.*)'}], 'host_name': u'(.*)'}}."
|
||||||
@ -818,7 +825,8 @@ logs:
|
|||||||
- name: Instance Guest Services Disable
|
- name: Instance Guest Services Disable
|
||||||
type: nfv_vim_instance_guest_services_disable
|
type: nfv_vim_instance_guest_services_disable
|
||||||
file: _instance_task_work.py
|
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': '(.*)'}]."
|
'(.*)', 'service': '(.*)'}]."
|
||||||
fields:
|
fields:
|
||||||
- instance_name
|
- instance_name
|
||||||
@ -828,7 +836,8 @@ logs:
|
|||||||
- name: Instance Guest Services Disable Callback
|
- name: Instance Guest Services Disable Callback
|
||||||
type: nfv_vim_instance_guest_services_disable_callback
|
type: nfv_vim_instance_guest_services_disable_callback
|
||||||
file: _instance_task_work.py
|
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':
|
'reason': (.*), 'result-data': {'instance_uuid': u'(.*)', 'services':
|
||||||
\\[{'admin_state': '(.*)', 'restart_timeout': (.*), 'oper_state': '(.*)',
|
\\[{'admin_state': '(.*)', 'restart_timeout': (.*), 'oper_state': '(.*)',
|
||||||
'name': '(.*)'}], 'host_name': u'(.*)'}}."
|
'name': '(.*)'}], 'host_name': u'(.*)'}}."
|
||||||
@ -862,7 +871,8 @@ logs:
|
|||||||
- name: Instance Guest Services Vote Callback
|
- name: Instance Guest Services Vote Callback
|
||||||
type: nfv_vim_instance_guest_services_vote_callback
|
type: nfv_vim_instance_guest_services_vote_callback
|
||||||
file: _instance_task_work.py
|
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'(.*)',
|
'uuid': u'(.*)', 'completed': (.*), 'reason': (.*), 'host-name': u'(.*)',
|
||||||
'timeout': (.*)}."
|
'timeout': (.*)}."
|
||||||
fields:
|
fields:
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
title: VIM Documentation
|
title: VIM Documentation
|
||||||
title_expanded: Virtual Infrastructure Manager Documentation
|
title_expanded: Virtual Infrastructure Manager Documentation
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
page_title: Software Image Management
|
page_title: Software Image Management
|
||||||
page_description: >
|
page_description: >
|
||||||
These interfaces allows an authorized consumer functional block to manage
|
These interfaces allows an authorized consumer functional block to manage
|
||||||
|
@ -3,4 +3,5 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
page_title: Virtualised Compute Resource
|
page_title: Virtualised Compute Resource
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
page_title: Virtualised Network Resource
|
page_title: Virtualised Network Resource
|
||||||
page_description: >
|
page_description: >
|
||||||
These interfaces allows an authorized consumer functional block to manage
|
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.
|
This example demonstrates how to allocate a network with subnets.
|
||||||
request: >
|
request: >
|
||||||
cat > network_ipv4_subnets_request.txt
|
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_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": [
|
"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}
|
"wrs_subnet_prefix": 24}
|
||||||
]}}
|
]}}
|
||||||
|
|
||||||
@ -96,12 +104,21 @@ api_networks: &api_networks_grouping
|
|||||||
{"operation_result": null, "message": null,
|
{"operation_result": null, "message": null,
|
||||||
"network_data": {
|
"network_data": {
|
||||||
"network_attributes": {
|
"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": [
|
"layer3_attributes": [
|
||||||
{"is_dhcp_enabled": true, "meta_data": null, "wrs_subnet_ip": "192.168.12.0", "gateway_ip": "192.168.12.1",
|
{"is_dhcp_enabled": true,
|
||||||
"ip_version": "4", "wrs_subnet_prefix": 24}
|
"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"}}
|
"resource_id": "network-ipv4-subnets"}}
|
||||||
|
|
||||||
- id: update_network
|
- id: update_network
|
||||||
@ -166,10 +183,19 @@ api_networks: &api_networks_grouping
|
|||||||
{"network_resource_id": "network-ipv4-subnets",
|
{"network_resource_id": "network-ipv4-subnets",
|
||||||
"update_network_data": {
|
"update_network_data": {
|
||||||
"layer3_attributes": [
|
"layer3_attributes": [
|
||||||
{"ip_version": "4", "is_dhcp_enabled": true, "wrs_subnet_ip": "192.168.14.0", "wrs_subnet_prefix": "24"},
|
{"ip_version": "4",
|
||||||
{"ip_version": "6", "is_dhcp_enabled": false, "gateway_ip": "3FFE::1", "wrs_subnet_ip": "3FFE::",
|
"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"},
|
"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"}
|
"wrs_subnet_prefix": "24"}
|
||||||
]}}
|
]}}
|
||||||
|
|
||||||
@ -178,20 +204,40 @@ api_networks: &api_networks_grouping
|
|||||||
http://localhost:4545/v1/virtualised_resources/networks
|
http://localhost:4545/v1/virtualised_resources/networks
|
||||||
-d @network_update_ipv4_ipv6_subnets_request.txt
|
-d @network_update_ipv4_ipv6_subnets_request.txt
|
||||||
response: >
|
response: >
|
||||||
{"operation_result": null, "message": null,
|
{"operation_result": null,
|
||||||
|
"message": null,
|
||||||
"network_data": {
|
"network_data": {
|
||||||
"network_attributes": {
|
"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": [
|
"layer3_attributes": [
|
||||||
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
|
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
|
||||||
"wrs_subnet_ip": "192.168.15.0", "gateway_ip": "192.168.15.1",
|
"is_dhcp_enabled": false,
|
||||||
"ip_version": "4", "wrs_subnet_prefix": 24},
|
"meta_data": null,
|
||||||
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
|
"wrs_subnet_ip": "192.168.15.0",
|
||||||
"wrs_subnet_ip": "3ffe::", "gateway_ip": "3FFE::1", "ip_version": "6", "wrs_subnet_prefix": 16},
|
"gateway_ip": "192.168.15.1",
|
||||||
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": true, "meta_data": null,
|
"ip_version": "4",
|
||||||
"wrs_subnet_ip": "192.168.14.0", "gateway_ip": "192.168.14.1", "ip_version": "4", "wrs_subnet_prefix": 24}
|
"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"}}
|
"resource_id": "network-ipv4-subnets"}}
|
||||||
|
|
||||||
- id: delete_network
|
- id: delete_network
|
||||||
@ -279,16 +325,36 @@ api_networks: &api_networks_grouping
|
|||||||
{"operation_result": null, "message": null,
|
{"operation_result": null, "message": null,
|
||||||
"query_result": [
|
"query_result": [
|
||||||
{"network_attributes": {
|
{"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": [
|
"layer3_attributes": [
|
||||||
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
|
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
|
||||||
"wrs_subnet_ip": "192.168.15.0", "gateway_ip": "192.168.15.1", "ip_version": "4", "wrs_subnet_prefix": 24},
|
"is_dhcp_enabled": false,
|
||||||
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
|
"meta_data": null,
|
||||||
"wrs_subnet_ip": "3ffe::", "gateway_ip": "3FFE::1", "ip_version": "6", "wrs_subnet_prefix": 16},
|
"wrs_subnet_ip": "192.168.15.0",
|
||||||
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": true, "meta_data": null,
|
"gateway_ip": "192.168.15.1",
|
||||||
"wrs_subnet_ip": "192.168.14.0", "gateway_ip": "192.168.14.1", "ip_version": "4", "wrs_subnet_prefix": 24}
|
"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"}]}
|
"resource_id": "network-ipv4-subnets"}]}
|
||||||
|
|
||||||
api_group_list:
|
api_group_list:
|
||||||
|
@ -3,4 +3,5 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# 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
3
nfv/nfv-tests/lint_check.sh
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
echo "Update this file to run lint activities outside of tox"
|
@ -3,8 +3,9 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
default:
|
default:
|
||||||
guest_hb: yes
|
guest_hb: true
|
||||||
|
|
||||||
pause_instance: cirros-guest-1
|
pause_instance: cirros-guest-1
|
||||||
unpause_instance: cirros-guest-1
|
unpause_instance: cirros-guest-1
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
---
|
||||||
default:
|
default:
|
||||||
pause_instance: cirros-1
|
pause_instance: cirros-1
|
||||||
unpause_instance: cirros-1
|
unpause_instance: cirros-1
|
||||||
|
Loading…
Reference in New Issue
Block a user