summaryrefslogtreecommitdiffstats
path: root/common-app-api/src/test
diff options
context:
space:
mode:
authordavsad <david.sadlier@est.tech>2021-01-29 13:35:59 +0000
committerChristophe Closset <christophe.closset@intl.att.com>2021-01-30 09:21:52 +0000
commit3cd2fa718e7f0c96988374e0843372d3e48b4659 (patch)
tree3488abc1ae32013cc289800fc32ecd982457b3e2 /common-app-api/src/test
parent7ceb6f99ee7490cebc0e2641acfe453029875cc0 (diff)
Fix onboarding artifact name changed
Prevent Yang module filenames with prefix _3gpp losing leading _ Issue-ID: SDC-3415 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: I68afb6c8a1ef2fa58a37af20a2119d3b648ba272
Diffstat (limited to 'common-app-api/src/test')
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
index 2d5122a13f..e7aad96f60 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
@@ -724,6 +724,24 @@ public class ValidationUtilsTest {
}
@Test
+ public void validateNormalizeFileNameFor3gppYangModule() {
+ final String testName = "_3gpptestfile";
+
+ String result = ValidationUtils.normalizeFileName(testName);
+
+ assertEquals(result, testName);
+ }
+
+ @Test
+ public void validateNormalizeFileNameStripLeadingUnderscore() {
+ final String testName = "_testfile";
+
+ String result = ValidationUtils.normalizeFileName(testName);
+
+ assertEquals(result, "testfile");
+ }
+
+ @Test
public void checkValidateUrlReturnsTrueIfURLIsValid() {
final String testUrl = "http://test.co/valid/url/";
#n84'>84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 
tosca_definitions_version: tosca_simple_yaml_1_0_0
metadata:
  template_name: Main
imports:
- openecomp_heat_index:
    file: openecomp-heat/_index.yml
node_types:
  org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
  org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
  inputs:
    flavor:
      hidden: false
      immutable: false
      type: string
    p1:
      hidden: false
      immutable: false
      type: string
      description: p1
    image:
      hidden: false
      immutable: false
      type: string
    p2:
      hidden: false
      immutable: false
      type: string
      description: p2
    names:
      hidden: false
      immutable: false
      type: string
    myIPs:
      hidden: false
      immutable: false
      type: string
      description: ip1
    availability_zone_1:
      hidden: false
      immutable: false
      type: string
      description: myAvailability_zone_1
    net:
      hidden: false
      immutable: false
      type: string
      description: UID of network
  node_templates:
    myNovaServer1:
      type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
      properties:
        flavor:
          get_input: flavor
        availability_zone:
          get_input: availability_zone_1
        image:
          get_input: image
        name:
          get_input:
          - names
          - 0
    myNovaServer2:
      type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
      properties:
        flavor:
          get_input: flavor
        availability_zone:
          get_input: availability_zone_1
        image:
          get_input: image
        name:
          get_input:
          - names
          - 0
    myPort2:
      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
      properties:
        replacement_policy: AUTO
        ip_requirements:
        - ip_version: 4
          ip_count_required:
            is_required: true
          floating_ip_count_required:
            is_required: false
        security_groups:
        - get_input: p2
        fixed_ips:
        - ip_address:
            get_input:
            - myIPs
            - 0
        mac_requirements:
          mac_count_required:
            is_required: false
        network:
          get_input: net
      requirements:
      - binding:
          capability: tosca.capabilities.network.Bindable
          node: myNovaServer1
          relationship: tosca.relationships.network.BindsTo
    myPort1:
      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
      properties:
        replacement_policy: AUTO
        ip_requirements:
        - ip_version: 4
          ip_count_required:
            is_required: true
          floating_ip_count_required:
            is_required: false
        security_groups:
        - get_input: p1
        fixed_ips:
        - ip_address:
            get_input:
            - myIPs
            - 0
        mac_requirements:
          mac_count_required:
            is_required: false
        network:
          get_input: net
      requirements:
      - binding:
          capability: tosca.capabilities.network.Bindable
          node: myNovaServer1
          relationship: tosca.relationships.network.BindsTo
    myPort4:
      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
      properties:
        replacement_policy: AUTO
        ip_requirements:
        - ip_version: 4
          ip_count_required:
            is_required: true
          floating_ip_count_required:
            is_required: false
        security_groups:
        - get_input: p2
        fixed_ips:
        - ip_address:
            get_input:
            - myIPs
            - 0
        mac_requirements:
          mac_count_required:
            is_required: false
        network:
          get_input: net
      requirements:
      - binding:
          capability: tosca.capabilities.network.Bindable
          node: myNovaServer2
          relationship: tosca.relationships.network.BindsTo
    myPort3:
      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
      properties:
        replacement_policy: AUTO
        ip_requirements:
        - ip_version: 4
          ip_count_required:
            is_required: true
          floating_ip_count_required:
            is_required: false
        security_groups:
        - get_input: p1
        fixed_ips:
        - ip_address:
            get_input:
            - myIPs
            - 0
        mac_requirements:
          mac_count_required:
            is_required: false
        network:
          get_input: net
      requirements:
      - binding:
          capability: tosca.capabilities.network.Bindable
          node: myNovaServer2
          relationship: tosca.relationships.network.BindsTo
  groups:
    main_group:
      type: org.openecomp.groups.heat.HeatStack
      properties:
        heat_file: ../Artifacts/main.yml
        description: cmaui server template for vMMSC
      members:
      - myNovaServer1
      - myNovaServer2
      - myPort2
      - myPort1
      - myPort4
      - myPort3
    SVCgroup1_simpleGroup_group:
      type: tosca.groups.Root
      members:
      - myNovaServer1
  policies:
    SVCgroup1_policy:
      type: org.openecomp.policies.placement.valet.Exclusivity
      properties:
        level: host
      targets:
      - SVCgroup1_simpleGroup_group