Merge pull request #89 from inexio/pre-release

Pre release
inexio · Nov 3, 2021 · 8d67873 · 8d67873
2 parents 1cdb3f9 + 017d65f
commit 8d67873
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: ghcr.io/inexio/thola
+          images: ghcr.io/${{ github.repository }}
           tags: type=semver,pattern={{version}}
 
       - name: Login to GitHub Container Registry

diff --git a/doc/doc.go b/doc/doc.go
@@ -28,4 +28,4 @@
 package doc
 
 // Version specifies the current version.
-const Version = "v0.5.1"
+const Version = "v0.5.2"
diff --git a/test/create_testdata/main.go b/test/create_testdata/main.go
@@ -177,7 +177,7 @@ func getDeviceTestData(device string) (test.DeviceTestData, error) {
 
 	baseRequest := request.BaseRequest{
 		DeviceData: request.DeviceData{
-			IPAddress:      "172.20.0.8",
+			IPAddress:      "snmpsim1",
 			ConnectionData: connectionData,
 		},
 	}

diff --git a/test/device_test_data.go b/test/device_test_data.go
@@ -173,7 +173,7 @@ func WaitForSNMPSim(community string, port int) error {
 	r := request.IdentifyRequest{
 		BaseRequest: request.BaseRequest{
 			DeviceData: request.DeviceData{
-				IPAddress: "172.20.0.8",
+				IPAddress: "snmpsim1",
 				ConnectionData: network.ConnectionData{
 					SNMP: &network.SNMPConnectionData{
 						Communities:              []string{community},

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -90,9 +90,9 @@ func init() {
 		log.Fatal().Err(err).Msg("failed to unmarshal test config!")
 	}
 
-	snmpSimIPs = make(chan string, 3)
-	snmpSimIPs <- "172.20.0.8"
-	snmpSimIPs <- "172.20.0.9"
+	snmpSimIPs = make(chan string, 2)
+	snmpSimIPs <- "snmpsim1"
+	snmpSimIPs <- "snmpsim2"
 }
 
 func TestIntegration(t *testing.T) {

diff --git a/test/testdata/docker-compose.yml b/test/testdata/docker-compose.yml
@@ -9,26 +9,11 @@ services:
     depends_on:
       - snmpsim1
       - snmpsim2
-    networks:
-      tholanetwork:
-        ipv4_address: 172.20.0.7
   snmpsim1:
     image: thola/snmpsim:latest
     volumes:
       - ${THOLA_TEST_SNMPRECDIR}:/usr/local/snmpsim/data/
-    networks:
-      tholanetwork:
-        ipv4_address: 172.20.0.8
   snmpsim2:
     image: thola/snmpsim:latest
     volumes:
-      - ${THOLA_TEST_SNMPRECDIR}:/usr/local/snmpsim/data/
-    networks:
-      tholanetwork:
-        ipv4_address: 172.20.0.9
-
-networks:
-  tholanetwork:
-    ipam:
-      config:
-        - subnet: 172.20.0.0/24
+      - ${THOLA_TEST_SNMPRECDIR}:/usr/local/snmpsim/data/