diff options
Diffstat (limited to 'adapters/mso-openstack-adapters/src')
2 files changed, 31 insertions, 11 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java index d3faf1d7bf..9726197172 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java @@ -44,15 +44,4 @@ public class HeatBridgeUtils { } return Optional.empty(); } - - public static Optional<String> getMatchingPhysicalNetworkName(final String pserverPinterfaceName) { - if (pserverPinterfaceName.contains(COMPUTE_SIDE_DEDICATED_SRIOV_PREFIX)) { - return Optional.of( - pserverPinterfaceName.replace(COMPUTE_SIDE_DEDICATED_SRIOV_PREFIX, OS_SIDE_DEDICATED_SRIOV_PREFIX)); - } else if (pserverPinterfaceName.contains(COMPUTE_SIDE_SHARED_SRIOV_PREFIX)) { - return Optional - .of(pserverPinterfaceName.replace(COMPUTE_SIDE_SHARED_SRIOV_PREFIX, OS_SIDE_SHARED_SRIOV_PREFIX)); - } - return Optional.empty(); - } } diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/utils/HeatBridgeUtilsTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/utils/HeatBridgeUtilsTest.java new file mode 100644 index 0000000000..bbc99bd258 --- /dev/null +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/utils/HeatBridgeUtilsTest.java @@ -0,0 +1,31 @@ +package org.onap.so.heatbridge.utils; + +import static org.assertj.core.api.Assertions.assertThat; +import java.util.Optional; +import org.junit.Test; + +public class HeatBridgeUtilsTest { + + @Test(expected = IllegalStateException.class) + public void matchServerName_canNotBeNull() { + HeatBridgeUtils.getMatchingPserverPifName(null); + } + + @Test + public void matchServerName_isDedicated() { + Optional<String> serverName = HeatBridgeUtils.getMatchingPserverPifName("dedicated-testServer"); + assertThat(serverName).isNotEmpty().hasValue("sriov-d-testServer"); + } + + @Test + public void matchServerName_isShared() { + Optional<String> serverName = HeatBridgeUtils.getMatchingPserverPifName("shared-testServer"); + assertThat(serverName).isNotEmpty().hasValue("sriov-s-testServer"); + } + + @Test + public void matchServerName_unknown() { + Optional<String> serverName = HeatBridgeUtils.getMatchingPserverPifName("differentServerName"); + assertThat(serverName).isEmpty(); + } +} |