add c_tag and s_tag to TOSCA; remove vlan_id
5 files changed