summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-12Merge "fix import and vRNC Ctrl_net definition error"julien zhang2-8/+8
2016-07-10fix import and vRNC Ctrl_net definition errorshangxdy2-8/+8
1. Currently DM_Port_Ctrl requirement definition requirements: virtualBinding: DM virtualLink: CTRL_Net_Host shall be below: requirements: virtualBinding: DM_Host virtualLink: CTRL_Net 2. In function of _load_import_template when import vRNC definition, it will return "None, None" instead of return Null in case of no value return. Change-Id: I81d2d471eafff8ebd77eef356e6178e1f7701a22 JIRA: PARSER-65 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-10Fix bug in python3.4: 'dict_keys' object does not support indexingshangxdy2-3/+4
In python3.4, dictory's function of key() return value is a dict_key object, not list, so the follow code will be error: dict x = {1:11, 2:22, 3;33} y= x.keys()[0] the error is TypeError: 'dict_keys' object does not support indexing, the correct expression is below: y = list(x.keys())[0] So parser's code will be modified refer to above. Change-Id: I41e0c28167c7823fc735aaf3afc78c1a9a15e9e0 JIRA: PARSER-64 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-10Synchronise the openstack bugsshangxdy80-656/+2404
When run unittests through tox, some test cases are always error, the errors are already done in openstack community, so it's necessary to synchronise the fixes. Change-Id: Ib29078e6cc138a474e89c6a2cc90ad7a1db1bb46 JIRA: PARSER-63 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-08Merge "netsted template validate type error"julien zhang5-14/+14
2016-07-08Merge "Affinity and anti-affinity translate to heat resource type"julien zhang3-3/+81
2016-07-07fix tox error when run unittestsxd4-0/+28
Currently when run "tox -epep8" it's ok, but it will be error when run "tox -epy27" or run "tox -epy34", the reason is no file .testr.conf and .converagerc in project root directory Change-Id: Ic6ab721738692c389d63bc2d84a4c2a21b397778 JIRA: PARSER-62 Signed-off-by: sxd <shang.xiaodong@zte.com.cn>
2016-07-05Affinity and anti-affinity translate to heat resource typeshangxdy3-3/+81
Translate simple tosca policy types of tosca.policy.Placement.Colocate and tosca.policy.Placement.Antilocate into heat resource type(nova::servergroup and nova::server) Change-Id: Icbe8c51c158886608a196951df19e9a503cb786a JIRA: PARSER-39 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-04Merge "The grouptype's parent_type definition is error"julien zhang2-0/+12
2016-07-04Merge "Divide VDU into soft component and VDU for the vRNC case"julien zhang3-55/+160
2016-07-04Merge "fix error when run unittest case"julien zhang2-3/+1
2016-07-04Merge "EntityTemplate has no property of parent_type"julien zhang2-0/+22
2016-07-04Merge "The artifacttype's parent_type definition is error"julien zhang2-9/+18
2016-07-01The grouptype's parent_type definition is errorshangxdy2-0/+12
1. Group type define parent_type, but it shall be statuefulentity, not string, so the method of is_derived_from in group entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: I6e78b9dbf9ad0593db9246d34be29d8ec6f092ed JIRA: PARSER-54 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-01fix error when run unittest caseshangxdy2-3/+1
when run tox -epy27, there are errors in function of test_relationship for key in relation.keys(): rel_tpl = relation.get(key).get_relationship_template() if rel_tpl: self.assertEqual( rel_tpl[0].type, "tosca.relationships.ConnectsTo") rel_tpl is a list so real_tpl[0].type can be other value, not only tosca.relationships.ConnectsTo. JIRA: PARSER:61 Change-Id: Ibdc7307888f5281ac0bd806088483f8c46416968 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-30Merge "Incorrect inheritance of requirements in NodeType"julien zhang1-2/+7
2016-06-30Merge "The relationship type's parent_type definition is not complete"julien zhang2-1/+7
2016-06-30Merge "The policytype's parent_type definition is error"julien zhang2-7/+13
2016-06-29netsted template validate type errorshangxdy5-14/+14
When import nested template, validate type error, in the validate list lack the type of "topology_template" Change-Id: Ic16e02f460dc59936dfc5a361a21b9533f0e5e83 JIRA: PARSER-58 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-29Divide VDU into soft component and VDU for the vRNC caseshangxdy3-55/+160
Currently the heat-translator can't translate the VDU with interface, so VDU shall be divided into SoftComponent and VDU, and the interface will be expressed in SoftComponent node. Change-Id: I1f0e0c6bef88ed66edd39e21e4e6221eb15e3188 JIRA: PARSER-57 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-16The artifacttype's parent_type definition is errorshangxdy2-9/+18
1. Artifact type define parent_type, but it shall be statuefulentity, not string, so the method of is_derived_from in artifact entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: I8e64a28da0287ff5653da69a0cf15016c8ed937f JIRA: PARSER-53 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-16EntityTemplate has no property of parent_typeshangxdy2-0/+22
1. EntityTemplate is the parent of NodeTemplate,but there is no definition of parent_type definition, so the method of is_derived_from will be error when call the parent_type's method. 2. The bug will submit to openstack community. Change-Id: If6d360932fd610f001934d23aac63e11ac16fddf JIRA: PARSER-51 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-16Merge "The definition in test file subsystem.yaml is error"julien zhang1-0/+3
2016-06-16Merge "Nodetype's logical is incomplete"julien zhang1-0/+4
2016-06-15Incorrect inheritance of requirements in NodeTypeshangxdy1-2/+7
1. When define a new NodeType that inherits from a normative type that has some requirements, and if the reqirement item name is same as parent's, there will be duplicated requirements, not override the parent's item. 2. The bug will submit to openstack community. Change-Id: I22f6e723179a8a8c334d37c1a69b7039dc1f6ae7 JIRA: PARSER-56 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-15Merge "Create vRNC test code."julien zhang1-0/+54
2016-06-15Merge "Create test case about nfv tosca"julien zhang6-37/+671
2016-06-15Merge "tosco-parser supports importing the other service with topology template"julien zhang3-9/+39
2016-06-15The relationship type's parent_type definition is not completeshangxdy2-1/+7
1. Relationship type define parent_type, but it shall include custom def, so the method of is_derived_from in group entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: Ia12b18543e3b1d28bfb946abd11b546a9eba9669 JIRA: PARSER-55 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-15The policytype's parent_type definition is errorshangxdy2-7/+13
1. policy type define parent_type, but it shall be statefulentity, not string, so the method of is_derived_from in policy entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: I25e1cb04e9c13eea6d47ed0bfeac961f59146842 JIRA: PARSER-52 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-13Create vRNC test code.shangxdy1-0/+54
Unit test code for vRNC case. JIRA: PARSER-34 Change-Id: Ie4a0431e3cdfd56d2ef42760da30a8f2bb6fdb5d Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-13Create test case about nfv toscashangxdy6-37/+671
As a developer; I want to known the availability of current nfv tosca definitions about node types, capabilities types and relationship types. So i create some test cases to validate it. JIRA: PARSER-34 Change-Id: Id57e38c066eea1d2090a816f5129aa95de464d32 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-05tosco-parser supports importing the other service withshangxdy3-9/+39
topology template As a tosca-parser developer; I want to implement the function of substitution_mapping; So that must support the import topology template firstly Change-Id: Ie26aab712e7870e1ec345ad654460bb84014f207 JIRA: PARSER-48 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-05The definition in test file subsystem.yaml is errorshangxdy1-0/+3
1. The input parameter my_cpus in definition of subsystem.yaml lack the default value, so when the file subsystem.yaml is error when used as a node template implementation. 2. The bug will be submitted to openstack community. Change-Id: I1f912dab47fe3751d0a992b02dd2a2253af6f158 JIRA: PARSER-45 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-04Nodetype's logical is incompleteshangxdy1-0/+4
When node is selected by abstract description and the node capability is customed, None will be return. JIRA:PARSER-41 Change-Id: I4b3e7233f766aac61a4ffc363c000bb3ebea19ad Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-05-31Adding two new committersAric Gardner1-2/+2
Change-Id: I356c88886d698f4527a65696f17f946aa6d07a32 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
2016-05-27Merge "Minor changes for better reading"Julien1-24/+25
2016-05-19Merge "bugs:The code in function of get_all_requirements is duplicated"julien zhang1-19/+1
2016-05-19Merge "Add attributes of address to tosca.nodes.nfv.CP address"julien zhang1-0/+3
2016-05-19Merge "Add affinity policy type definition"julien zhang1-0/+10
2016-05-19Merge "Update the vRNC definition against the latest nfv tosca definition"julien zhang1-108/+153
2016-05-19Merge "Update the vRNC types(node types/relation types) definiton"julien zhang1-175/+32
2016-05-19Merge "Update the nfv tosca definietion against the latest spec"julien zhang1-573/+573
2016-05-15bugs:The code in function of get_all_requirements is duplicatedshangxdy1-19/+1
1、The virtualLink requirement of tosca.nodes.nfv.CP defined below: In nodetype.py, the most code in functon of get_all_requirements is not needed,becuase the property of requirements has realized the main logical in current get_all_requirements. So the duplicated code will be deleted. 2、The bug will be submitted to openstack community. JIRA: PARSER-37 Change-Id: I1a346ffc388546dd9c65a1b8d32e32859150d077 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-05-15Add attributes of address to tosca.nodes.nfv.CP addressshangxdy1-0/+3
According to the openstack comments, it's necessary to add the attribute of address, which was deleted because the IP_address was duplication to CP's parent's attributes. The related modifications are refer to: 1. https://gerrit.opnfv.org/gerrit/#/c/12567. 2. https://bugs.launchpad.net/tosca-parser/+bug/1574715. JIRA: PARSER-36 Change-Id: I6bf894cbba440013175df478cce00fa08906dc19 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-29Update the vRNC definition against the latest nfv tosca definitionshangxdy1-108/+153
Update the vRNC definition according to the latest vRNC type. include node_templates, groups, policies and outputs. JIRA:PARSER-31 Change-Id: Ie69a8e4480188ffad8247d68e5c15085bbb44848 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-29Update the vRNC types(node types/relation types) definitonshangxdy1-175/+32
Update the vRNC type definition according to the nfv tosca definiton. include MM, CM, DM and LB. JIRA:PARSER-35 Change-Id: I3017c93081bc77fc2ac1e4633f4232f130f6b4de Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-27Update the nfv tosca definietion against the latest specshangxdy1-573/+573
Base types are modified: 1.tosca.nodes.nfv.VDU: from tosca.nodes.SoftwareComponent to tosca.nodes.Compute 2.tosca.nodes.nfv.CP: from tosca.nodes.Root to tosca.nodes.network.Port 3.tosca.nodes.nfv.VL: from tosca.nodes.Root to tosca.nodes.network.Network 4.tosca.relationships.nfv.VirtualBindsTo: from tosca.relationships.ConnectsTo to tosca.relationships.network.BindsTo 5. tosca.relationships.nfv.VirtualLinksTo: from tosca.relationships.ConnectsTo to tosca.relationships.network.LinksTo 6. tosca.capabilities.nfv.VirtualBindable: i from tosca.capabilities.Root to tosca.capabilities.network.Bindable 7. tosca.capabilities.nfv.VirtualLinkable: from tosca.capabilities.Root to tosca.capabilities.network.Linkable. JIRA:PARSER-30 Change-Id: If6f32cf891a979ae88c345980930451f876ad9e0 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-27Add affinity policy type definitionshangxdy1-0/+10
Add two definition in parser: tosca.policy.Placement.Colocate tosca.policy.Placement.Antilocate JIRA:PARSER-33 Change-Id: I0259bbc1ce2616dcbc28a912c34a7513e9432ff5 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-27Merge "update docs build names in .gitignore"julien zhang1-2/+2