pushing current code

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/core/k8.mjs

@@ -394,27 +394,33 @@ export class K8 {
     const parentDir = path.dirname(destPath)
     const fileName = path.basename(destPath)
     const filterMap = new Map(Object.entries(filters))
-    const entries = await this.listDir(podName, containerName, parentDir)
-
-    for (const item of entries) {
-      if (item.name === fileName && !item.directory) {
-        let found = true
-
-        for (const entry of filterMap.entries()) {
-          const field = entry[0]
-          const value = entry[1]
-          this.logger.debug(`Checking file ${podName}:${containerName} ${destPath}; ${field} expected ${value}, found ${item[field]}`, { filters })
-          if (`${value}` !== `${item[field]}`) {
-            found = false
-            break
+
+    try {
+      const entries = await this.listDir(podName, containerName, parentDir)
+
+      for (const item of entries) {
+        if (item.name === fileName && !item.directory) {
+          let found = true
+
+          for (const entry of filterMap.entries()) {
+            const field = entry[0]
+            const value = entry[1]
+            this.logger.debug(`Checking file ${podName}:${containerName} ${destPath}; ${field} expected ${value}, found ${item[field]}`, { filters })
+            if (`${value}` !== `${item[field]}`) {
+              found = false
+              break
+            }
           }
-        }
 
-        if (found) {
-          this.logger.debug(`File check succeeded ${podName}:${containerName} ${destPath}`, { filters })
-          return true
+          if (found) {
+            this.logger.debug(`File check succeeded ${podName}:${containerName} ${destPath}`, { filters })
+            return true
+          }
         }
       }
+    } catch (e) {
+      this.logger.error(e.message, e)
+      throw e
     }
 
     return false

src/core/platform_installer.mjs

@@ -22,17 +22,25 @@ import * as semver from 'semver'
 import { FullstackTestingError, IllegalArgumentError, MissingArgumentError } from './errors.mjs'
 import { constants } from './index.mjs'
 import { Templates } from './templates.mjs'
+import { flags } from '../commands/index.mjs'
 
 /**
  * PlatformInstaller install platform code in the root-container of a network pod
  */
 export class PlatformInstaller {
-  constructor (logger, k8) {
+  constructor (logger, k8, configManager) {
     if (!logger) throw new MissingArgumentError('an instance of core/Logger is required')
     if (!k8) throw new MissingArgumentError('an instance of core/K8 is required')
 
     this.logger = logger
     this.k8 = k8
+    this.configManager = configManager
+  }
+
+  _getNamespace () {
+    const ns = this.configManager.getFlag(flags.namespace)
+    if (!ns) throw new MissingArgumentError('namespace is not set')
+    return ns
   }
 
   async validatePlatformReleaseDir (releaseDir) {
@@ -290,14 +298,11 @@ export class PlatformInstaller {
       let nodeSeq = 0
       let accountIdSeq = parseInt(startAccountId.num.toString(), 10)
       for (const nodeId of nodeIDs) {
-        const podName = Templates.renderNetworkPodName(nodeId)
-        const svcName = Templates.renderNetworkSvcName(nodeId)
-
         const nodeName = nodeId
         const nodeNickName = nodeId
 
-        const internalIP = await self.k8.getPodIP(podName)
-        const externalIP = await self.k8.getClusterIP(svcName)
+        const internalIP = Templates.renderFullyQualifiedNetworkPodName(this._getNamespace(), nodeId)
+        const externalIP = Templates.renderFullyQualifiedNetworkSvcName(this._getNamespace(), nodeId)
 
         const account = `${accountIdPrefix}.${accountIdSeq}`
         if (releaseVersion.minor >= 40) {

src/core/templates.mjs

@@ -163,4 +163,12 @@ export class Templates {
         throw new FullstackTestingError(`unknown dep: ${dep}`)
     }
   }
+
+  static renderFullyQualifiedNetworkPodName (namespace, nodeId) {
+    return `${Templates.renderNetworkPodName(nodeId)}.network-${nodeId}.${namespace}.svc.cluster.local`
+  }
+
+  static renderFullyQualifiedNetworkSvcName (namespace, nodeId) {
+    return `${Templates.renderNetworkSvcName(nodeId)}.${namespace}.svc.cluster.local`
+  }
 }

src/index.mjs

@@ -51,7 +51,7 @@ export function main (argv) {
     const chartManager = new ChartManager(helm, logger)
     const configManager = new ConfigManager(logger)
     const k8 = new K8(configManager, logger)
-    const platformInstaller = new PlatformInstaller(logger, k8)
+    const platformInstaller = new PlatformInstaller(logger, k8, configManager)
     const keyManager = new KeyManager(logger)
     const accountManager = new AccountManager(logger, k8)
 

test/e2e/commands/node.test.mjs

@@ -28,11 +28,12 @@ import {
 import {
   bootstrapNetwork,
   getDefaultArgv,
+  getTestConfigManager,
   TEST_CLUSTER
 } from '../../test_util.js'
 
 describe.each([
-  { releaseTag: 'v0.47.0-alpha.0', keyFormat: constants.KEY_FORMAT_PFX, testName: 'node-cmd-e2e-pfx' },
+  // { releaseTag: 'v0.47.0-alpha.0', keyFormat: constants.KEY_FORMAT_PFX, testName: 'node-cmd-e2e-pfx' },
   { releaseTag: 'v0.47.0-alpha.0', keyFormat: constants.KEY_FORMAT_PEM, testName: 'node-cmd-e2e-pem' }
 ])('NodeCommand', (input) => {
   const testName = input.testName
@@ -51,11 +52,11 @@ describe.each([
   const nodeCmd = bootstrapResp.cmd.nodeCmd
 
   afterAll(async () => {
-    await k8.deleteNamespace(namespace)
+    // await k8.deleteNamespace(namespace)  // TODO renable this line
     await accountManager.close()
   })
 
-  describe(`Node should start successfully [release ${input.keyFormat}, keyFormat: ${input.releaseTag}]`, () => {
+  describe(`Node should start successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     it('Balance query should succeed', async () => {
       expect.assertions(2)
 
@@ -102,7 +103,7 @@ describe.each([
       expect.assertions(1)
 
       try {
-        await expect(nodeCmd.checkNetworkNodeProxyUp('node0', 30313)).resolves.toBeTruthy()
+        await expect(nodeCmd.checkNetworkNodeProxyUp('node0', 30399)).resolves.toBeTruthy()
       } catch (e) {
         nodeCmd.logger.showUserError(e)
         expect(e).toBeNull()
@@ -112,10 +113,14 @@ describe.each([
     }, 20000)
   })
 
-  describe(`Node should refresh successfully [release ${input.keyFormat}, keyFormat: ${input.releaseTag}]`, () => {
+  describe(`Node should refresh successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     let podName = ''
     beforeAll(async () => {
-      const podArray = await k8.getPodsByLabel(['app=haproxy-node0', 'fullstack.hedera.com/type=haproxy'])
+      argv[flags.nodeIDs.name] = 'node0'
+      const configManager = getTestConfigManager(`${testName}-solo.config`)
+      configManager.update(argv, true)
+
+      const podArray = await k8.getPodsByLabel(['app=network-node0', 'fullstack.hedera.com/type=network-node'])
 
       if (podArray.length > 0) {
         podName = podArray[0].metadata.name
@@ -124,15 +129,37 @@ describe.each([
       } else {
         throw new Error('pod for node0 not found')
       }
-    })
+    }, 20000)
+
+    it('Node0 should be running', async () => {
+      expect(podName).toContain('node0')
+      try {
+        await expect(nodeCmd.checkNetworkNodePod(namespace, 'node0')).resolves.toBeTruthy()
+      } catch (e) {
+        nodeCmd.logger.showUserError(e)
+        expect(e).toBeNull()
+      } finally {
+        await nodeCmd.close()
+      }
+    }, 20000)
 
-    it('Node 0 should not be running', async () => {
+    it('Node0 should not be ACTIVE', async () => {
+      expect(3)
       expect(podName).toContain('node0')
-      const podArray = await this.k8.getPodsByLabel(['app=haproxy-node0', 'fullstack.hedera.com/type=haproxy'])
-      console.log(podArray)
-    })
-    it('Node refresh should succeed', async () => {
-    })
+      try {
+        await expect(nodeCmd.stop(argv)).resolves.toBeTruthy()
+        await expect(nodeCmd.checkNetworkNodeStarted('node0', 5)).rejects.toThrowError()
+      } catch (e) {
+        nodeCmd.logger.showUserError(e)
+        expect(e).not.toBeNull()
+      } finally {
+        await nodeCmd.close()
+      }
+    }, 20000)
+
+    it('Node0 refresh should succeed', async () => {
+      await expect(nodeCmd.refresh(argv)).resolves.toBeTruthy()
+    }, 1200000)
     // TODO need to test with PVCs
     // TODO will have changes when configMap/secrets are implemented
   })

test/e2e/core/platform_installer_e2e.test.mjs

@@ -29,7 +29,7 @@ import { getTestCacheDir, getTmpDir, testLogger } from '../../test_util.js'
 describe('PackageInstallerE2E', () => {
   const configManager = new ConfigManager(testLogger)
   const k8 = new K8(configManager, testLogger)
-  const installer = new PlatformInstaller(testLogger, k8)
+  const installer = new PlatformInstaller(testLogger, k8, configManager)
   const testCacheDir = getTestCacheDir()
   const podName = 'network-node0-0'
   const packageVersion = 'v0.42.5'

test/test_util.js

@@ -113,7 +113,7 @@ export function bootstrapTestVariables (testName, argv,
   const helm = new Helm(testLogger)
   const chartManager = new ChartManager(helm, testLogger)
   const k8 = k8Arg || new K8(configManager, testLogger)
-  const platformInstaller = new PlatformInstaller(testLogger, k8)
+  const platformInstaller = new PlatformInstaller(testLogger, k8, configManager)
   const accountManager = new AccountManager(testLogger, k8, constants)
   const opts = {
     logger: testLogger,

test/unit/core/platform_installer.test.mjs

@@ -28,7 +28,7 @@ describe('PackageInstaller', () => {
   const testLogger = core.logging.NewLogger('debug')
   const configManager = new ConfigManager(testLogger)
   const k8 = new core.K8(configManager, testLogger)
-  const installer = new PlatformInstaller(testLogger, k8)
+  const installer = new PlatformInstaller(testLogger, k8, configManager)
 
   describe('validatePlatformReleaseDir', () => {
     it('should fail for missing path', async () => {